filechooserwidget: Rename error variable
authorEmmanuele Bassi <ebassi@gnome.org>
Sat, 15 Oct 2016 20:30:47 +0000 (21:30 +0100)
committerEmmanuele Bassi <ebassi@gnome.org>
Mon, 17 Oct 2016 10:44:10 +0000 (11:44 +0100)
Avoid shadowing an existing error.

gtk/gtkfilechooserwidget.c

index 9be432059d6889fe57f5c3884246e6db5808fd80..c323cb8ca953725f188a0fdbe573c7a5b87aa4d1 100644 (file)
@@ -6567,13 +6567,13 @@ name_entry_get_parent_info_cb (GCancellable *cancellable,
     }
   else if (parent_is_folder)
     {
-      GError *error;
+      GError *internal_error;
 
-      error = NULL;
-      g_set_error_literal (&error, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED,
+      internal_error = NULL;
+      g_set_error_literal (&internal_error, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED,
                            _("You do not have access to the specified folder."));
 
-      error_changing_folder_dialog (impl, data->parent_file, error);
+      error_changing_folder_dialog (impl, data->parent_file, internal_error);
     }
   else if (info)
     {
@@ -8533,7 +8533,6 @@ post_process_ui (GtkFileChooserWidget *impl)
   GFile            *file;
 
   /* Some qdata, qdata can't be set with GtkBuilder */
-  g_object_set_data (G_OBJECT (impl->priv->browse_files_tree_view), "fmq-name", "file_list");
   g_object_set_data (G_OBJECT (impl->priv->browse_files_tree_view), I_("GtkFileChooserWidget"), impl);
 
   /* Setup file list treeview */